From 3058bd4b35c863efd35f2f3125f8eb827bb4de28 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Wed, 8 Feb 2006 17:24:29 +0100 Subject: [PATCH] Fix i386 CPU hotplug, and CPU hotplug when maxcpus= kernel boot option is used. Signed-off-by: Keir Fraser --- linux-2.6-xen-sparse/arch/i386/kernel/time-xen.c | 2 +- linux-2.6-xen-sparse/drivers/xen/core/smpboot.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/linux-2.6-xen-sparse/arch/i386/kernel/time-xen.c b/linux-2.6-xen-sparse/arch/i386/kernel/time-xen.c index a93026083d..a5c7a5960f 100644 --- a/linux-2.6-xen-sparse/arch/i386/kernel/time-xen.c +++ b/linux-2.6-xen-sparse/arch/i386/kernel/time-xen.c @@ -147,7 +147,7 @@ static int __init __independent_wallclock(char *str) } __setup("independent_wallclock", __independent_wallclock); -int tsc_disable __initdata = 0; +int tsc_disable __devinitdata = 0; static void delay_tsc(unsigned long loops) { diff --git a/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c b/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c index 5940fe816b..198cd836b5 100644 --- a/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c +++ b/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c @@ -223,8 +223,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus) cpu_sibling_map[0] = cpumask_of_cpu(0); cpu_core_map[0] = cpumask_of_cpu(0); - if (max_cpus != 0) - xen_smp_intr_init(0); + xen_smp_intr_init(0); for_each_cpu_mask (cpu, cpu_possible_map) { if (cpu == 0) -- 2.30.2